[TOOLS] xenctrl.h defines __XEN_TOOLS__ if it's not already.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/debugger/gdb/gdbbuild b/tools/debugger/gdb/gdbbuild
index 90cb4df4eac922f17ac5672429d0da133a2c608f..419adab61d00ead76d58bad4795344b9c6c8f3ed 100755 (executable)
--- a/tools/debugger/gdb/gdbbuild
+++ b/tools/debugger/gdb/gdbbuild
@@ -18,7 +18,7 @@ cd gdb-6.2.1-linux-i386-xen
 if [ "$MAKE" ]; then
     $MAKE
 elif which gmake ; then
-    gmake -j4 CFLAGS=-D__XEN_TOOLS__
+    gmake -j4
 else
-    make -j4 CFLAGS=-D__XEN_TOOLS__
+    make -j4
 fi

diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h
index f2f32c47bd57d7b1b6af55c57f346180badc9472..0a5cfadd3d1ec48a9448a09e35c488c536e36139 100644 (file)
--- a/tools/libxc/xenctrl.h
+++ b/tools/libxc/xenctrl.h
@@ -9,6 +9,11 @@
 #ifndef XENCTRL_H
 #define XENCTRL_H
 
+/* Tell the Xen public headers we are a user-space tools build. */
+#ifndef __XEN_TOOLS__
+#define __XEN_TOOLS__ 1
+#endif
+
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/ptrace.h>